From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Fri, 26 Apr 2013 00:39:19 +0000 (-0400)
Subject: network: Remove _createAPItem
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4061
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9c222c7e5ce81ec5c578e62fdb0e82a60781df86;p=gnome-shell.git

network: Remove _createAPItem

The code flows better if this is inlined like this.

https://bugzilla.gnome.org/show_bug.cgi?id=698918
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 76127cb6e..e07fbffd2 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1069,21 +1069,6 @@ const NMDeviceWireless = new Lang.Class({
         }
     },
 
-    _createAPItem: function(connection, accessPointObj) {
-        let item = new NMNetworkMenuItem(accessPointObj.accessPoints[0]);
-        item._connection = connection;
-        item.connect('activate', Lang.bind(this, function() {
-            let accessPoints = accessPointObj.accessPoints;
-            for (let i = 0; i < accessPoints.length; i++) {
-                if (accessPoints[i].connection_valid(connection)) {
-                    this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
-                    break;
-                }
-            }
-        }));
-        return item;
-    },
-
     _clearSection: function() {
         this.parent();
 
@@ -1180,10 +1165,20 @@ const NMDeviceWireless = new Lang.Class({
             return;
         }
 
+        network.item = new NMNetworkMenuItem(network.accessPoints[0]);
         if(network.connections.length > 0) {
-            network.item = this._createAPItem(network.connections[0], network);
+            let connection = network.connections[0];
+            network.item._connection = connection;
+            network.item.connect('activate', Lang.bind(this, function() {
+                let accessPoints = network.accessPoints;
+                for (let i = 0; i < accessPoints.length; i++) {
+                    if (accessPoints[i].connection_valid(connection)) {
+                        this._client.activate_connection(connection, this.device, accessPoints[i].dbus_path, null);
+                        break;
+                    }
+                }
+            }));
         } else {
-            network.item = new NMNetworkMenuItem(network.accessPoints[0]);
             network.item.connect('activate', Lang.bind(this, function() {
                 let accessPoints = network.accessPoints;
                 if (   (accessPoints[0]._secType == NMAccessPointSecurity.WPA2_ENT)